Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 20 Jun 2010 22:46:22 +0000 (22:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 20 Jun 2010 22:46:22 +0000 (22:46 +0000)
commit8e2e3b5b26bab2db80caee566cab3a3736d72077
treedd8ef6d76dba200578fce24a2e742a46cbbca158
parentbfe30560c7aaa3a2fba62ea393d5c7d6399436be
parentee8dd0593e68277ed91fbe29443c324d913fbace
Merge from mainline.